(font-lock): Add jit-lock as explicit group member.

(jit-lock): Group declaration moved to jit-lock.el.
(toplevel): Don't explicitly require jit-lock, since it's autoloaded
when necessary.

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index b76c818a517024f3fce95e200ef123d09e2d8d43..c7cd817b4f13e27078a9104a01f37cfaf3e8b662 100644 (file)
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -210,7 +210,7 @@
 (require 'syntax)
 
 ;; Define core `font-lock' group.
-(defgroup font-lock nil
+(defgroup font-lock '((jit-lock custom-group))
   "Font Lock mode text highlighting package."
   :link '(custom-manual "(emacs)Font Lock")
   :link '(custom-manual "(elisp)Font Lock Mode")
@@ -237,13 +237,6 @@
   :link '(custom-manual "(emacs)Support Modes")
   :load 'lazy-lock
   :group 'font-lock)
-
-(defgroup jit-lock nil
-  "Font Lock support mode to fontify just-in-time."
-  :link '(custom-manual "(emacs)Support Modes")
-  :version "21.1"
-  :load 'jit-lock
-  :group 'font-lock)
 \f
 ;; User variables.
 
@@ -1927,8 +1920,5 @@ This function could be MATCHER in a MATCH-ANCHORED `font-lock-keywords' item."
 \f
 (provide 'font-lock)
 
-(when (eq font-lock-support-mode 'jit-lock-mode)
-  (require 'jit-lock))
-
 ;;; arch-tag: 682327e4-64d8-4057-b20b-1fbb9f1fc54c
 ;;; font-lock.el ends here